ostbuild: Minor fixes
authorColin Walters <walters@verbum.org>
Fri, 11 May 2012 20:24:23 +0000 (16:24 -0400)
committerColin Walters <walters@verbum.org>
Fri, 18 May 2012 20:30:44 +0000 (16:30 -0400)
src/ostbuild/pyostbuild/builtin_build_components.py
src/ostbuild/pyostbuild/builtin_chroot_compile_one.py

index 126fe3eae6107b6c762f876b067581c8a13af9c2..54d3cc390b01c4646d1e58ff055b7977aa3d3a1f 100755 (executable)
@@ -286,7 +286,7 @@ class OstbuildBuildComponents(builtins.Builtin):
 
         self._save_bin_snapshot(required_components, component_architectures)   
 
-        if args.compose:
+        if args.compose or args.compose_only:
             run_sync(['ostbuild', 'compose', '--prefix=' + self.prefix])
         
 builtins.register(OstbuildBuildComponents)
index 4615f05e1b979792c24fcb47ebd177ec58d5938f..463fc9341a3eab07f076fd6d4971031cc9a89f6b 100755 (executable)
@@ -66,7 +66,7 @@ class OstbuildChrootCompileOne(builtins.Builtin):
             arch_buildroot_rev = arch_buildroot.get('ostree-revision')
         else:
             buildroots = self.snapshot['architecture-buildroots']
-            arch_rev_suffix = buildsroots['architecture']
+            arch_rev_suffix = buildroots[architecture]
             arch_buildroot_name = 'bases/' + arch_rev_suffix
 
         if arch_buildroot_rev is None: